From 56710ee7d7a1877d0d19fef8f3b4697bd3ea5e83 Mon Sep 17 00:00:00 2001 From: Sven Herzberg Date: Fri, 8 Aug 2008 22:22:26 +0000 Subject: [PATCH] Get the gdk+cairo test to pass distcheck, too 2008-08-09 Sven Herzberg Get the gdk+cairo test to pass distcheck, too * gdk/tests/Makefile.am: set GDK_PIXBUF_MODULE_FILE so the test can pick up the one created at build time * gdk/tests/check-gdk-cairo.c (main): delete the output files after a successful test run svn path=/trunk/; revision=21048 --- ChangeLog | 9 +++++++++ gdk/tests/Makefile.am | 4 +++- gdk/tests/check-gdk-cairo.c | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a97f6496b..3ebe4fef87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-08-09 Sven Herzberg + + Get the gdk+cairo test to pass distcheck, too + + * gdk/tests/Makefile.am: set GDK_PIXBUF_MODULE_FILE so the test can + pick up the one created at build time + * gdk/tests/check-gdk-cairo.c (main): delete the output files after a + successful test run + 2008-08-08 Sven Neumann * gtk/gtkscale.c diff --git a/gdk/tests/Makefile.am b/gdk/tests/Makefile.am index cb3570964f..afb9b34251 100644 --- a/gdk/tests/Makefile.am +++ b/gdk/tests/Makefile.am @@ -2,11 +2,13 @@ include $(top_srcdir)/Makefile.decl NULL= -#check_PROGRAMS=check-gdk-cairo +check_PROGRAMS=check-gdk-cairo TESTS=$(check_PROGRAMS) +TESTS_ENVIRONMENT=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders AM_CPPFLAGS=\ $(GDK_DEP_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_builddir)/gdk \ $(NULL) diff --git a/gdk/tests/check-gdk-cairo.c b/gdk/tests/check-gdk-cairo.c index 19f49951c4..5986c06e69 100644 --- a/gdk/tests/check-gdk-cairo.c +++ b/gdk/tests/check-gdk-cairo.c @@ -134,6 +134,9 @@ main (int argc, g_object_unref (pbuf_platform); g_object_unref (pbuf_imagesrf); + g_unlink ("gdksurface.png"); + g_unlink ("cairosurface.png"); + return 0; } -- 2.30.2